# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1153.67.21 -> 1.1153.67.22 # arch/ia64/kernel/fsys.S 1.19 -> 1.20 # arch/ia64/kernel/entry.S 1.50 -> 1.51 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/09/05 davidm@tiger.hpl.hp.com 1.1153.65.11 # Merge tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5 # into tiger.hpl.hp.com:/data1/bk/lia64/linux-ia64-2.5 # -------------------------------------------- # 03/09/05 davidm@tiger.hpl.hp.com 1.1153.67.22 # ia64: Direct sys_fadvise64() to sys_fadvise64_64(). # -------------------------------------------- # diff -Nru a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S --- a/arch/ia64/kernel/entry.S Tue Sep 9 01:05:10 2003 +++ b/arch/ia64/kernel/entry.S Tue Sep 9 01:05:10 2003 @@ -1448,7 +1448,7 @@ data8 sys_sched_setaffinity data8 sys_sched_getaffinity data8 sys_set_tid_address - data8 sys_fadvise64 + data8 sys_fadvise64_64 data8 sys_tgkill // 1235 data8 sys_exit_group data8 sys_lookup_dcookie diff -Nru a/arch/ia64/kernel/fsys.S b/arch/ia64/kernel/fsys.S --- a/arch/ia64/kernel/fsys.S Tue Sep 9 01:05:10 2003 +++ b/arch/ia64/kernel/fsys.S Tue Sep 9 01:05:10 2003 @@ -655,7 +655,7 @@ data8 0 // sched_setaffinity data8 0 // sched_getaffinity data8 fsys_set_tid_address // set_tid_address - data8 0 // fadvise64 + data8 0 // fadvise64_64 data8 0 // tgkill // 1235 data8 0 // exit_group data8 0 // lookup_dcookie